keyboard: Do the initial redraw in _init

It doesn't seem like there's anything preventing us from doing this.

https://bugzilla.gnome.org/show_bug.cgi?id=692678

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index c60649d50a61bef2b83ff75a292036ce41de357a..97e9223f98208c56b24a581c951ed1d1dba9d6ff 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -142,7 +142,6 @@ const Keyboard = new Lang.Class({
         this._focusInExtendedKeys = false;
 
         this._timestamp = global.display.get_current_time_roundtrip();
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
 
         this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
         this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
@@ -161,9 +160,8 @@ const Keyboard = new Lang.Class({
         }));
         this._keyboardRequested = false;
         this._keyboardRestingId = 0;
-    },
 
-    init: function () {
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
         this._redraw();
     },
 

diff --git a/js/ui/main.js b/js/ui/main.js
index f8235f6e15234c59a41c56997f97a99b308b9b28..9c9404d7a799f31f340e2db9bc46cb2f0cac3958 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -173,7 +173,7 @@ function start() {
     componentManager = new Components.ComponentManager();
 
     layoutManager.init();
-    keyboard.init();
+    layoutManager.prepareStartupAnimation();
     overview.init();
 
     global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,